From 0d047a359d25903418a855d1a46e0dfed411a51a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 30 Sep 2005 15:40:55 +0000 Subject: [PATCH] Don't leak pixbuf in some cases. (#317611, Tommi Komulainen) 2005-09-30 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Don't leak pixbuf in some cases. (#317611, Tommi Komulainen) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkimage.c | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e5c9326c86..c2c1097902 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-09-30 Matthias Clasen + * gtk/gtkimage.c (gtk_image_expose): Don't leak pixbuf in + some cases. (#317611, Tommi Komulainen) + * gtk/gtksocket-x11.c (_gtk_socket_windowing_size_request): Prevent overflow when storing size hints in an unsigned short variable. Tracked down by Ray Strode and Søren Sandmann. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e5c9326c86..c2c1097902 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-09-30 Matthias Clasen + * gtk/gtkimage.c (gtk_image_expose): Don't leak pixbuf in + some cases. (#317611, Tommi Komulainen) + * gtk/gtksocket-x11.c (_gtk_socket_windowing_size_request): Prevent overflow when storing size hints in an unsigned short variable. Tracked down by Ray Strode and Søren Sandmann. diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 23a76b7279..1061253e18 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -1784,9 +1784,6 @@ gtk_image_expose (GtkWidget *widget, image_bound.height, GDK_RGB_DITHER_NORMAL, 0, 0); - - g_object_unref (pixbuf); - pixbuf = NULL; } } else @@ -1829,6 +1826,9 @@ gtk_image_expose (GtkWidget *widget, gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0); } + if (pixbuf) + g_object_unref (pixbuf); + } /* if widget is drawable */ return FALSE; -- 2.30.2